Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

custom_calyptia: free machine_id when it is automatically set. #7978

Merged
merged 1 commit into from
Oct 24, 2023

Conversation

pwhelan
Copy link
Contributor

@pwhelan pwhelan commented Sep 26, 2023

Summary

The machine_id is configured and extracted automatically using the flb_utils_get_machine_id function when it is not set explicitly via config_map. When this occurs the value is not freed. This PR fixes that.


Enter [N/A] in the box, if an item is not applicable to your change.

Testing
Before we can approve your change; please submit the following in a comment:

  • Example configuration file for the change
  • Debug log output from testing the change
  • Attached Valgrind output that shows no leaks or memory corruption was found

If this is a change to packaging of containers or native binaries then please confirm it works for all targets.

  • Run local packaging test showing all targets (including any new ones) build.
  • Set ok-package-test label to test for all targets (requires maintainer to do).

Documentation

  • Documentation required for this feature

Backporting

  • Backport to latest stable release.

Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.

@pwhelan pwhelan temporarily deployed to pr September 26, 2023 16:44 — with GitHub Actions Inactive
@pwhelan pwhelan temporarily deployed to pr September 26, 2023 16:44 — with GitHub Actions Inactive
@pwhelan pwhelan temporarily deployed to pr September 26, 2023 16:44 — with GitHub Actions Inactive
@pwhelan pwhelan temporarily deployed to pr September 26, 2023 17:15 — with GitHub Actions Inactive
@pwhelan pwhelan added this to the Fluent Bit v2.1.11 milestone Sep 27, 2023
Copy link
Collaborator

@niedbalski niedbalski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@pwhelan pwhelan force-pushed the pwhelan-calyptia-fix-machine-id-leak branch from 7f15f7d to 76400c6 Compare October 23, 2023 19:16
@pwhelan pwhelan temporarily deployed to pr October 23, 2023 19:16 — with GitHub Actions Inactive
@pwhelan pwhelan temporarily deployed to pr October 23, 2023 19:16 — with GitHub Actions Inactive
@pwhelan pwhelan temporarily deployed to pr October 23, 2023 19:16 — with GitHub Actions Inactive
@pwhelan pwhelan temporarily deployed to pr October 23, 2023 19:51 — with GitHub Actions Inactive
@pwhelan pwhelan merged commit 747a620 into master Oct 24, 2023
40 of 42 checks passed
@pwhelan pwhelan deleted the pwhelan-calyptia-fix-machine-id-leak branch October 24, 2023 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants